From 5a577ce1f287ed5d8c50c897eb265fee2a7fd45a Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Tue, 5 Nov 2002 02:19:29 +0000
Subject: [PATCH] Rename our "round" to "si_round".

---
 defs.h     | 2 +-
 gpspilot.c | 6 +++---
 magnav.c   | 4 ++--
 util.c     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/defs.h b/defs.h
index 1710e10e6..6c8629a0e 100644
--- a/defs.h
+++ b/defs.h
@@ -202,7 +202,7 @@ char * xstrdup(const char *s);
  * to deal with possible floating-point representation errors.
  */
 
-signed int round( double d );
+signed int si_round( double d );
 
 /* 
  * Data types for Palm/OS files.
diff --git a/gpspilot.c b/gpspilot.c
index f6e508ed8..80fa6749b 100644
--- a/gpspilot.c
+++ b/gpspilot.c
@@ -128,9 +128,9 @@ gpspilot_writewpt(waypoint *wpt)
 
 	rec = xcalloc(sizeof(*rec)+46,1);
 	
-	be_write32(&rec->longitude, round(wpt->position.longitude.degrees * 3.6e6));
-	be_write32(&rec->latitude, round(wpt->position.latitude.degrees * 3.6e6));
-	be_write16(&rec->elevation, round(wpt->position.altitude.altitude_meters));
+	be_write32(&rec->longitude, si_round(wpt->position.longitude.degrees * 3.6e6));
+	be_write32(&rec->latitude, si_round(wpt->position.latitude.degrees * 3.6e6));
+	be_write16(&rec->elevation, si_round(wpt->position.altitude.altitude_meters));
 	be_write16(&rec->magvar, 0 );
 	
 	vdata = (char *)rec + sizeof(*rec);
diff --git a/magnav.c b/magnav.c
index 3e0c5c059..93de8a7cc 100644
--- a/magnav.c
+++ b/magnav.c
@@ -173,8 +173,8 @@ my_writewpt(waypoint *wpt)
 	
         be_write16( &rec->unknown2, 0);
 	
-	be_write32(&rec->longitude, round(wpt->position.longitude.degrees * 100000.0));
-	be_write32(&rec->latitude, round(wpt->position.latitude.degrees * 100000.0));
+	be_write32(&rec->longitude, si_round(wpt->position.longitude.degrees * 100000.0));
+	be_write32(&rec->latitude, si_round(wpt->position.latitude.degrees * 100000.0));
 	be_write32(&rec->elevation, wpt->position.altitude.altitude_meters);
 
 	rec->plot = 0;
diff --git a/util.c b/util.c
index b74767862..190920290 100644
--- a/util.c
+++ b/util.c
@@ -171,7 +171,7 @@ le_write32(void *addr, unsigned value)
 }
 
 signed int 
-round( double d )
+si_round( double d )
 {
 	if ( d < 0 ) {
 		return (signed int)(d-0.5);
-- 
2.30.2